Merge cherrypicks of ['googleplex-android-review.googlesource.com/25186780'] into 24Q1-release.

Change-Id: Icb2a27e150cddd1dba553af8630a9ef230bb04ed

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -15934,7 +15934,7 @@ public class ActivityManagerService extends IActivityManager.Stub
         try {
             sdkSandboxInfo =
                     sandboxManagerLocal.getSdkSandboxApplicationInfoForInstrumentation(
-                            sdkSandboxClientAppInfo, isSdkInSandbox);
+                            sdkSandboxClientAppInfo, userId, isSdkInSandbox);
         } catch (NameNotFoundException e) {
             reportStartInstrumentationFailureLocked(
                     watcher, className, "Can't find SdkSandbox package");