[automerger skipped] Merge 24Q3 to AOSP main am: d81dbf1b55 -s ours

am skip reason: Merged-In Ida2cbd05582d3f059e0208738f81f9f4a49620a7 with SHA-1 61e56d2321 is already in history

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

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