Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf am: 885aad17b5 am: 008ba7a698

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

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b