[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 am: d914ad7ad9

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

Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583
tree: 4631f35cdb975b116dec47d73a4a4fb7f172595f
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING