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: c25a7dc7 am: 41ba0c48

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



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