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: I35e370188cb7aeae147e8597dd01bba9c3d9222d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>