Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b
am: 461f4eb099

Change-Id: Id352fdb6da21a2150d3e8d062d7eba11878f6919