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