[automerger skipped] Merge "Move BatteryListener to InputManagerGlobal" into udc-dev am: cbdd0ac32b am: af61f9db76 -s ours
am skip reason: Merged-In Ie9db9166845772c27175026dc105fa8635c431dd with SHA-1 2ae8ad2f20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21986267
Change-Id: Iadf2ac1a52a1b43ebd4769ade527e714405557c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: