[automerger skipped] Merge "Enable dumpsys logging for BatteryController" into...

[automerger skipped] Merge "Enable dumpsys logging for BatteryController" into tm-qpr-dev am: 454b033e am: 4b03deb9 -s ours

am skip reason: Merged-In Ib1d6559cb1980f73bd98ab233ca012b4d12ac9a5 with SHA-1 70fd75a4 is already in history

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



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