[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a4 -s ours...

[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a4 -s ours am: 9316df95 -s ours am: 368ba20c -s ours am: d9fc7587 -s ours am: 064bf9dd -s ours am: d8ef6bc5 -s ours am: ad3ecbdd -s ours am: 8e922b95 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied2dd046476816e4038800c3be82888056f65e17