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

Change-Id: Icd8e328e3c810a644bfb83798bd42fed8dc70425