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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5