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