[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 2e973012 -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: Ib64890ef72bb502ef042297d150fb272d8f7c873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>