Merge "Revert "Enhance IMS/RCS graceful tear down"" into udc-dev am:...

Merge "Revert "Enhance IMS/RCS graceful tear down"" into udc-dev am: 2795f8ab am: c5bddce3 am: 8c7a4765 am: 4750c9dc

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



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