[automerger skipped] Merge "Mark ab/AP4A.240925.013 as merged" into...

[automerger skipped] Merge "Mark ab/AP4A.240925.013 as merged" into aosp-main-future am: 86e16e70 -s ours

am skip reason: Merged-In I35f65725b70fc0abb22aff46298d053d98d03b00 with SHA-1 c3cd8e3f is already in history

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



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