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: 086b83e6

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



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