[automerger skipped] Merge "Merge Android 14" into main am: b9139ab0 -s ours...

[automerger skipped] Merge "Merge Android 14" into main am: b9139ab0 -s ours am: 0274686c -s ours

am skip reason: Merged-In I78be52423a09711ff4949859e505f9f427a16941 with SHA-1 c14d8938 is already in history

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



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