[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4a -s ours am: 5045f120...

[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4a -s ours am: 5045f120 am: 7bdd4b32 -s ours am: 5f16b03f -s ours am: c54d68ea am: d3abc029 -s ours am: 57f93997 am: d988a5ca am: 1d3ffe65 am: 8de59262 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If238f043c30ef2dbb4c2363cad272f6353a9c043