[automerger skipped] Merge "Merge Android 13 QPR3" am: 4c796cf9 -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR3" am: 4c796cf9 -s ours am: 0016a88e -s ours am: 85e2bf06 -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: If620c1812fc35c7e2185d18c0abbd25631c7009d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>