[automerger skipped] Merge "Merge ab/AP4A.241205.013 into aosp-main-future"...

[automerger skipped] Merge "Merge ab/AP4A.241205.013 into aosp-main-future" into aosp-main-future am: 82cf6038 -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/+/30137415



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