[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: 40bd3620 -s ours am: 46b52697 -s ours am: c4f67d32 -s ours

am skip reason: subject contains skip directive

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



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