Merge "Add FEATURE_TELEPHONY_IMS definition"
am: ad075a3837

Change-Id: Ic1ec5ab56e6f944362032da3c4d1723a99dc8ca3