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

am skip reason: subject contains skip directive

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

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