[automerger skipped] Merge "Add NetworkType alternatives to IMS APIs" am: 8af28b9965 am: d3c6c37394 am: b817363f02 -s ours
am skip reason: Change-Id Ic00b83f2d0d8950855d43edc49ad24ce577943af with SHA-1 dd151f0e6c is in history

Change-Id: Ic2c8c2d20034de61e1e6fb959f0abd7aba3dbfab