[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 51fb54ce -s ours...

[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 51fb54ce -s ours am: 3b07dbd3 -s ours

am skip reason: Merged-In I94e32496801418fa40d794bbb06a0145f898f3ba with SHA-1 9d8ddd72 is already in history

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



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