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

am skip reason: Merged-In I56f0139c748a3a04df9f3998653121948846c8fe with SHA-1 ea53f43031 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/30532833

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