Revert "Correct the logic in NetworkCapabilitiesTest"

This reverts commit f08d3d4359.

Reason for revert: <Merge abnormal in automerger>

Change-Id: I0cdb401f4962050bf24dc9d9871d4ef15cf52629

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

@@ -328,8 +328,7 @@ public class NetworkCapabilitiesTest {
         if (isAtLeastS()) {
             netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2));
             netCap.setUids(uids);
-        }
-        if (isAtLeastR()) {
+        } else if (isAtLeastR()) {
             netCap.setOwnerUid(123);
             netCap.setAdministratorUids(new int[] {5, 11});
         }