[automerger skipped] Merge "Add InputDeviceBatteryListener to InputManager"...

[automerger skipped] Merge "Add InputDeviceBatteryListener to InputManager" into tm-qpr-dev am: 666111df am: 2b2b0da5 -s ours

am skip reason: Merged-In Idf2b06a099155a6f5cc13b55dcd40852f54aa56c with SHA-1 e86f73ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19866529



Change-Id: I42d8c5e73e73091a8fb64763220b462afae442e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>