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

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

Change-Id: I0317175e5c25616addd0b651d48ce47d61503f00