[automerger skipped] Merge 24Q4 into AOSP main am: 189b9a1a -s ours am: e6f360b5 -s ours

am skip reason: Merged-In Ib023bdbcba48311a906128bd7394106a01e47dee with SHA-1 599cd9c8 is already in history

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



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