Merge "Include cached battery usage in app-restriction proto dump" into tm-dev...

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

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



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