[automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and...

[automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff -s ours

am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 fbbcc55f is already in history

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

Change-Id: I4296f4accb9cf3c066c8b6c7e22f7bdf84b866af