[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."...

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: 6811428c -s ours am: 1b68f3bf -s ours am: a7d220aa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6d1066d472d9b053a19ac80c8dba094d0017a271