[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 skip reason: Merged-In I3cf9d649a6fd6f9ce320cd720f460033b5ba7d50 with SHA-1 8a009cb5 is already in history

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



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