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

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

Change-Id: Ife51a5f9684c6f7fa5ce49a976c522bb0871913e