Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev
am: 322a336e3f  -s ours

Change-Id: If31043a227aa3cdb751f1e14c3bf8de811133b57