Merge "Add proto output of battery usage stats" into tm-qpr-dev am: eb590798

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



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