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

am skip reason: subject contains skip directive

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

Change-Id: I689123f39fc3399d71f873025605319131ff19ab