[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: fcb70c21 -s ours

am skip reason: Merged-In I24f28c7f36c13f94fb68b44a4a5a0ccebaad7158 with SHA-1 c32e669e is already in history

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



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