am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev

* commit '61052dec7d76a6ab0a39d2471cea8d9205062a0e':
  Keep existing API behavior that regressed.

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