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

am skip reason: Merged-In Ice37eea8315c33013963a0db5779b0d1849a1974 with SHA-1 ba68f46b16 is already in history

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

Change-Id: Icf3b65d91f2875806cbf5af305793fcca5e72192
Signed-off-by: Automerger Merge Worker <[email protected]>