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

am skip reason: Merged-In Ic2cfdbb292daf12d19ab565e684d7cc8295e52f3 with SHA-1 1ef813bac3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/3257835

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