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

Change-Id: Id9ea164e537b6f12b2af02f2833b0f95d3391e1c