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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4696861836d97e73a376f20280a16cc6f236ca