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