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

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



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