[automerger skipped] Merge "Add charging string V2 for settings" into 24D1-dev am: 67df73a1fd -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: I18e3d66151f8e9d0b8a6cdf47567d562f5208ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>