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

Change-Id: I34986e1ecef90a4342334ad853d91e5ea6990233