[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: 98c67a8f -s ours am: 6a47120c -s ours am: 5ad3aaa7 -s ours am: 75b20dda -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2147155



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