[automerger skipped] Merge Android 12 QPR1 am: 8e262bb8 -s ours am:...

[automerger skipped] Merge Android 12 QPR1 am: 8e262bb8 -s ours am: e245fd58 -s ours am: 3e24a298 -s ours am: 5f5594a0 -s ours

am skip reason: Merged-In I954b3b14faf04729c63e15bea4ccd48553346a9c with SHA-1 71d52e72 is already in history

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

Change-Id: Idf63cf0370c1dd3f60bba4c50e668f5e9ae2a30a