Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c am: cdc43dfc73

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

Change-Id: I6c7be98e5752bcdfffb00b94333ed052ac2f9f9e