Merge "Re-deprecating Capabilities in ImsFeature"
am: f4cd3de77a

Change-Id: I3dab955f70d6f4027f79cefc3b9d35c1cbfffaa6