[automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: 313a9ba5 -s ours

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

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



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