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

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c7 am: 93a41871 -s ours am: 8f0658f2 -s ours am: 4fa35e41 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id083ac4906df682d8774a9f0f21d5aa7bb5c74d2