[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4 -s ours am: 2901d294 -s ours am: 108a1848 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998



Change-Id: I7c00a9c9276847ffe480610fb72e3d47da42b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>