Merge "Get ApnIpType from ConnectivityManager#getLinkProperties()" into rvc-dev