Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev am: 39b6912019 -s ours
am: d283e9c344 -s ours
Change-Id: I3bbeb7e326b3b009634e862248d961a07116796f
This commit is contained in: