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

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

Change-Id: I8c31ba33ed59eef2034e9ae52f46d1f0e861a521