[automerger skipped] Merge "Vendor API level 202504 is now frozen" into main...

[automerger skipped] Merge "Vendor API level 202504 is now frozen" into main am: 829f9657 am: dbf66782 -s ours

am skip reason: Merged-In I774364cef5ec5fe1d6c3c83d5da77ca666d376f7 with SHA-1 64b98704 is already in history

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



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