Merge "Update full charged string (1/2)" into tm-dev am: 7dd6a1fc am: 1d446113

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938504

Change-Id: Ib11a0f6f9bfb01f96395d329825f80677bdab63e