Merge "Making NetworkCapabilities @NonNull" am: d038933790 am: 4feaee30eb

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

Change-Id: Ifb34aa77e00c79226a73fe0121fb898c11578977