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

am skip reason: Merged-In I43bf9e11ad021dbad82f6d82163a97a3856e032d with SHA-1 159860c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/30626135



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