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: 80e40c9f am: e71a25e5

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



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