Merge "Remove apntype ims on Vzw legacy CDMA networks"