[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: 16c11901 -s ours am: 82df6214 -s ours am: ad23b64a -s ours am: f6d34cba -s ours am: 51e42c90 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2149033



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