[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: 87daf9f5 -s ours am: 9cec8577 -s ours

am skip reason: subject contains skip directive

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



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