Merge "Delayed IMS tear down when voice call is ongoing" into tm-dev am: 877810fc

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



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