[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE"...

[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: e1f45da5 -s ours am: 8112403a -s ours am: 78810ab0 -s ours am: 03e49a9f -s ours am: e4fb8c20 -s ours

am skip reason: subject contains skip directive

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



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