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

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

Change-Id: Ib3005e70fd2f70a9ba591157c9ac9edd4642ddae