[automerger skipped] Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" am: b50cea987b am: 19aa681ad5
am: 8f1a1f83dc -s ours
am skip reason: change_id Iabb0e7cadae52d8ebe922f61a878298ad4dd04b0 with SHA1 1a952dd940 is in history

Change-Id: I6fcd207d3eae1ece992978edfbbd1264135b5cb3