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