Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi"