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

[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f -s ours am: 74305a65 -s ours am: 2180784c -s ours am: a66a06e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id0cf8ca4564c096b738ee37792f8c88692189630