Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23
am: f2ac860b7c

Change-Id: I01e287b4df82a53a522566d33b3166f7801badca