[automerger skipped] Add charging string V2 for settings am: d9b44a8b9c
-s ours
am skip reason: Merged-In Ic68bf4231da81d865faa285bca97a929abe26a42 with SHA-1 6f3c97f60a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26933005
Change-Id: I3d71ed8af87210521c245935ef9019b6495f3bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: