[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e...

[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e am: 47853553 -s ours am: 1d2519ad -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4ad6a89859c1c8db0dff384dd876eab1486bc8a1