[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd407 -s ours am: 0e1deb15

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

Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524