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

Change-Id: I31ef741eb83d64c476e5930d5762514b5d4cb16f