[automerger skipped] Merge "Merge Android 14 QPR1" into main am: bb21f5e8 -s...

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: bb21f5e8 -s ours am: b5b4071c -s ours am: 1ca73779 -s ours

am skip reason: Merged-In I0fbeab491a1800bb133ff0991870b78e11cc00da with SHA-1 2d69ac78 is already in history

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



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