Merge "Making NetworkCapabilities @NonNull" am: 1f21e4acf4 am: e8fb563c9a am: ff27afbc45 am: 05426db34d

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

Change-Id: I113520a4859c4b5b2bb375346a440ba0cd46126a