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

Change-Id: I3bbeb7e326b3b009634e862248d961a07116796f