Merge "Delay IMS teardown till VoPS call ends" into udc-dev am: 27a10e2f

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



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