Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348

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

Change-Id: I32bc9ee2db0b192513f782455a91d7336875a039
tree: f87ea9be059cca9a8449644d655c93cd652177de
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING