[automerger skipped] Merge Android 14 am: f7fec4b2 -s ours am: 2d64e79b -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: Ib37bd52a011cc64b0371871e6569b0b8212867f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>