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

[automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390 -s ours am: 799b80f9 -s ours am: f47a8c16 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4d010b748e2388bc2f6456ae3738390758448f1c