[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc -s ours am: 588a5a15 -s ours am: 5b0b300d -s ours am: cc6cd60c -s ours

am skip reason: subject contains skip directive

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



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