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

am skip reason: subject contains skip directive

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



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