Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev am: fde112a2eb -s ours
am: c5b37d1bcf -s ours
Change-Id: Ic327ebd95d342411e1b32c1ba6a99142e88bc0a5
This commit is contained in: