[automerger skipped] Merge "Move BatteryListener to InputManagerGlobal" into...

[automerger skipped] Merge "Move BatteryListener to InputManagerGlobal" into udc-dev am: cbdd0ac3 am: c21df502 -s ours

am skip reason: Merged-In Ie9db9166845772c27175026dc105fa8635c431dd with SHA-1 6c3f9692 is already in history

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



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