[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

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

Change-Id: If46dd4f97490ae2e68e03dfddee5885537ca493d