[automerger skipped] Merge "Merge Android 13 QPR2" am: 04f11bab -s ours am: 24985340 -s ours

am skip reason: Merged-In I6db4a66039f0455c566e2ab009effc4a5b7f37be with SHA-1 bae7e457 is already in history

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



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