Merge "Add FEATURE_TELEPHONY_IMS feature definition"
am: be07f77163

Change-Id: Ie460f8f61cd5474f8a4cedc88b1bffb2af9ad30a