Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e3 am: 461f4eb0 am: beae6211 Change-Id: If3742ea0e2151b9b710eda2fed280c31f7960393