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