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

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

Change-Id: I53a692383de98d959b029cfd618621f47059fdd5
tree: 2cfac7e4001b1bc29542035d2b7aa55589a6743b
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING