[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b

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

Change-Id: I633b0e35a224055ca9f07de627322f48065a234e