[automerger skipped] Merge "Merge Android 13 QPR3...

[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: ace52299 -s ours am: 4c3e3f81 -s ours am: 0b77e682 -s ours

am skip reason: Merged-In I74aeba2004bde944f2b855e4f8a8823d1dca94ba with SHA-1 747be7e6 is already in history

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



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