Merge "Making NetworkCapabilities @NonNull" am: 1f21e4acf4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941593

Change-Id: I0654583490222563dac7b60aae4f4596c0e1b83f