[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9 -s ours am: 43bed90e -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ia37728c78d3f27a651ae620d52be0f5b4aa7f18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>