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