[automerger skipped] Merge Android 13 QPR2 am: a5b2fd4407 -s ours am: 39410d721b -s ours am: 50f3c358a2 -s ours

am skip reason: Merged-In Id96bd4a233e9208865afaa9c3fe0cccb239bad93 with SHA-1 de8e8c9846 is already in history

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

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