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