Merge "Include cached battery usage in app-restriction proto dump" into tm-dev am: 9e607df5

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



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