[automerger skipped] Merge Android 12L am: 792ea4aa -s ours am: d7d49776...

[automerger skipped] Merge Android 12L am: 792ea4aa -s ours am: d7d49776 -s ours am: 56c061f4 -s ours am: a31805fe -s ours

am skip reason: Merged-In I4802449adeae1c8fcebe8bd56f135fdfc11572e5 with SHA-1 20c1798a is already in history

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

Change-Id: If86febe52119bf29d692a137433ab431dce4a13b