Merge "Add NetworkType alternatives to IMS APIs"
am: 8af28b9965

Change-Id: Id9fb30026c7aed9777f9fc8e8512b062e7698d8a