Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348 am: 06238861b5 am: b948cc3ba0

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

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b
tree: b7e64e593762b37ece20d8351a3c43b6c90b4dcc
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING