Merge "Small refactor battery usage code according to the comments in previous...

Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b

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



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