[automerger skipped] Merge changes from topic "app_battery_usage" into...

[automerger skipped] Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad7288 am: 1a7168a1 -s ours

am skip reason: Merged-In I55a393517ae01d6a8c17106a3e7750323838cebb with SHA-1 67599bce is already in history

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



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