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

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

Change-Id: I224e3c120ac07677d80396247f5b9e74c1bfd1a4