[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138 -s ours am: 7bd20e27ab am: 90a1422f8c -s ours

am skip reason: subject contains skip directive

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

Change-Id: If59a3b1d966223a067f4dc3eb54a3628b3232efc