Merge "Update battery state string" into sc-dev am: e966debfd5
am: ac62a0a172
am: 0c60387b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886 Change-Id: Ia78bb6321da72057ef0465bbbf11f2b6fd2169d8
This commit is contained in: