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