Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev am: 38e0dae439

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06231512af655da4f29e16f2108533fd6d6b759d