[automerger skipped] Merge Android 13 QPR3...

[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 980ae425 -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: Id225d356470f607017487a278b759e2ff7f9a94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>