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

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



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