[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: e0493334 -s ours am: 4426362d -s ours

am skip reason: contains skip directive

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



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