Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" am: b50cea987b
am: 19aa681ad5

Change-Id: I41fbf2df61f1156b231189730690c9d48c04c3c4