Revert "Remove field from getSdkSandboxApplicationInfoForInstrum..."

Revert submission 25159737-unflagged_api

Reason for revert: b/307905132

Reverted changes: /q/submissionid:25159737-unflagged_api
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d667b5b861b42ab07827ead537c7b77d80af1422)
Merged-In: Id8cf259eb8f7ec04e0587a3cae2f32f11a0fbdb6
Change-Id: Id8cf259eb8f7ec04e0587a3cae2f32f11a0fbdb6

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");