[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec7459 -s ours...

[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec7459 -s ours am: 57358903 -s ours am: 77d2c798 am: 84f9417f -s ours am: fc0292dc am: 724278a1 am: 0dd7f8db

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98f1e8a2518ee278963fd4f63edf7b043445dd14