[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: c91f8b09 -s ours am: b17f196c -s ours am: d5b07b03 -s ours am: b49d68d7 -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: I4aec401ef3c4e915dce6c3580d8b87f813270dbc