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

Change-Id: Iee9acc2ab5ad77eb0125ddd24e4917180e991b5b