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

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



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