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

Change-Id: I33d6756e2aa56bd83963ff55f637be1e32be2511