[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 80f8771166 -s ours

am skip reason: Merged-In I93b4ff41c564236001648abc7c3dfb07d6ae2424 with SHA-1 1e6e1729e0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/27273789

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