Merge "Refactor compact battery status method (1/2)" into tm-dev am: a01477087c

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

Change-Id: Iaef1acdf77cbe69ac90206fdc2941aa34e8cdec9