Merge "Update App battery usage page and add tests." into tm-qpr-dev am: 50c7cb83 am: 2f40a918

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



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