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

Change-Id: Ied592bf6112574399a1e808da337004e1c35f244