[automerger skipped] Merge "RESTRICT AUTOMERGE Add extra battery indication...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add extra battery indication logging" into tm-qpr-dev am: 1f8800df am: 1ba5a70d -s ours am: bf97b682 -s ours am: 4f3a17cf -s ours

am skip reason: subject contains skip directive

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



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