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: e0d7ae0a am: 1f63ae74

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



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