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