[automerger skipped] Merge "Port new version battery usage chart...

[automerger skipped] Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e4 am: 6992c28b -s ours

am skip reason: Merged-In I9142c0d4e00dea3771777ba9aedeab07b635fa1a with SHA-1 284e049c is already in history

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



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