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

Change-Id: I7ee60daa9c4266e9b9179032815dd7267e06377f