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