Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev