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: 5578bc7d am: f35554bb

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



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