[automerger skipped] Clean up ImsFeature status callbacks correctly in...

[automerger skipped] Clean up ImsFeature status callbacks correctly in FeatureConnection am: c41c0c29 am: 047c6836 -s ours am: 54fbde7b -s ours am: 0a5b8bfe -s ours

am skip reason: Change-Id Iedf820f9da10088c845b34c2a08658d7204241b3 with SHA-1 455bbbf9 is in history

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

Change-Id: I3e00eb61e984dab16a411c050baed21c22da9b75