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

Change-Id: Ie28a6a11a97dcff35f26dd003d495c14ceb67242