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