Merge "Revert "Correct the logic in NetworkCapabilitiesTest""