Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev