Merge "Use "IMS" apn name instead of "VZWIMS" for Verizon ims type"
am: 9130ec78b3

Change-Id: Ic59a387b521a2780b92ef1d4355db4f137b181f9