Android 7.0.0 Release 35 (NBD92Q)
Merge "Default apn ip type to ipv4" into nyc-dev