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

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

Change-Id: Iece5767237ca477e1dba0d1cda2bc6e42d2c457c