[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours
am skip reason: skipped by user chiachangwang Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005 Change-Id: Ib56fafd17dc88b9ded6cd39501a3bfa4cf5fe1b5
This commit is contained in: