[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 0e25d85f2f -s ours

am skip reason: Merged-In I4415e3fc418879e4e9e346826ac0335d7f1fd75c with SHA-1 31d5d78291 is already in history

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

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