am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev
am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev

* commit '180152af684c214db2fd1f1527c88be1f2c7657e':
  Remove constants for VOICE_CONTROL_ZEN_MODE.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base