Merge "Add FEATURE_TELEPHONY_IMS definition" am: ad075a3837 am: 86999554ea
am: 93dd117ee6

Change-Id: Icb40054aaeab8921bc371129528b851e1af78e29