Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad7288

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726220



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