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: f18460f5" into rvc-d1-dev-plus-aosp am: b0124fe7 am: 36f9fa7b
Change-Id: I8fcf70869a34b9e78d1aa82b277b285fe850ba33