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

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



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