Add SDK level check to adding sandbox UIDs. am: 512a4fe715

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

Change-Id: I46364ac7888505172cbfa22261ab4ed13fa8cb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/connectivity/Vpn.java

@@ -1646,7 +1646,9 @@ public class Vpn {
         for (String app : packageNames) {
             int uid = getAppUid(app, userId);
             if (uid != -1) uids.add(uid);
-            if (Process.isApplicationUid(uid)) {
+            // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
+            // ConnectivityServiceTest.
+            if (Process.isApplicationUid(uid) && SdkLevel.isAtLeastT()) {
                 uids.add(Process.toSdkSandboxUid(uid));
             }
         }