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