[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am:...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a431 -s ours am: 12033fe4 am: f5477b05 -s ours am: 857f3308 am: 24390f24 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e2b0a6f8ee26c300a58d70b94eb409d6568a542