[automerger skipped] Merge Android 13 QPR3 am: 5a34d61c -s ours am:...

[automerger skipped] Merge Android 13 QPR3 am: 5a34d61c -s ours am: 02703715 -s ours am: 7a82bff8 -s ours am: 81215b4b -s ours am: 93dbf1b9 -s ours

am skip reason: Merged-In Icb535b9f1a6ff398ba8cdfd6462d26b952997a55 with SHA-1 5b27b6a7 is already in history

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



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