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