Merge "Remove apntype ims on Vzw legacy CDMA networks" am: fd7114fa15 am: c4a0b8a0cd
am: 61b611b32f

Change-Id: I7767a070c9df9816a239ab8cc4f127f83ea4cd77