[automerger skipped] Delayed IMS tear down when voice call is ongoing am:...

[automerger skipped] Delayed IMS tear down when voice call is ongoing am: 1d3dee7f am: c14804ce -s ours

am skip reason: Merged-In I3e6fc857ba750259696f207715ae7abaf8129bef with SHA-1 c4fc0d07 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2091789



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