Merge "Local-only connection should have correct NetworkCapabilities" into udc-dev