[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: e6e31f9d1f -s ours

am skip reason: Merged-In I207a2bb4e8fd47ba7fc6d16b2dbac711344a1dc1 with SHA-1 d09f8740e6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/30283706

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