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

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



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