Android 7.0.0 release 1
Merge "Default apn ip type to ipv4" into nyc-dev