[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: b3aec9e6 -s ours am: 93c65cd0 -s ours am: 249f21f4 -s ours

am skip reason: subject contains skip directive

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



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