Android CTS 7.0 Release 12 (4215243)
Merge "Default apn ip type to ipv4" into nyc-dev