Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b am: 38b86a2c15 am: ca34df0a6a am: 7300467264

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

Change-Id: I83051032d59ad427b6b7d7ce9693b3e5534c618b