[automerger skipped] Merge "Add test for...

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b647 am: 8a98acb1 -s ours

am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 354b536b is already in history

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

Change-Id: I503dd64d09dc2b19682284d3d40e000d7189d955