Merge "Add FEATURE_TELEPHONY_IMS feature definition" am: be07f77163
am: 7ff11fbb2f

Change-Id: I4f7c42bcb1f7e19e7ad8ec4fc1afc7b9d5004233