[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876 -s ours am: 4cc5d437 -s ours am: d32e536a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia2387998ee285fd62a9c2454319c0875175b69c7