Merge "Merge "Clean up ImsFeature status callbacks correctly in...
Merge "Merge "Clean up ImsFeature status callbacks correctly in FeatureConnection" into rvc-dev am: de4cd0f2 am: 4ed03c17 am: b22f7513" into rvc-qpr-dev-plus-aosp am: 5cb566ea
Change-Id: Ic42326e5e95719120a0662fb2b5262e5ed6c2ef0