[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7 -s ours am: 74ca730b -s ours am: 22864c72 am: 24ec36b6 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67d0a5b8803ed1480752f1bd82852ce4d5ad8e13