Merge "RESTRICT AUTOMERGE Add extra battery indication logging" into tm-qpr-dev am: 1f8800df

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



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