Merge "Force a battery tracker update on dumping proto request" into tm-dev...

Merge "Force a battery tracker update on dumping proto request" into tm-dev am: 4740cb69 am: 9c2b4278 am: 8e786135

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



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