[automerger skipped] Merge Android 12 am: 99f4bd52 -s ours am: 381fd6a5 -s...

[automerger skipped] Merge Android 12 am: 99f4bd52 -s ours am: 381fd6a5 -s ours am: 84821e5b -s ours

am skip reason: Merged-In I854661d3c39b306d304c2b74724d802312555bf5 with SHA-1 2d1d1af2 is already in history

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

Change-Id: I75aab474b2459e47d92078499924cbcbf079f07e