Merge "Making NetworkCapabilities @NonNull" am: 1f21e4acf4 am: e8fb563c9a

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

Change-Id: Ifb34aa77e00c79226a73fe0121fb898c11578977