Merge "Clean up ImsFeature status callbacks correctly in FeatureConnection" into rvc-dev am: de4cd0f2 am: ce3a92c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/11546617

Change-Id: I043b2e139673f10811e10ffde2c670906cfdaec0