[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24