[automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a6 -s ours am: 1c6594bc -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iae30511de4026c8db432269ecc5f588242b1d8e6