Merge "Cache correct calling UID for VcnStatusCallbacks." am: 7510bf5e99 am: ff05984891

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

Change-Id: I3cfbd5b66ff444d78e47d6ddbf9ba9cd8390ac45

services/core/java/com/android/server/VcnManagementService.java

@@ -821,8 +821,7 @@ public class VcnManagementService extends IVcnManagementService.Stub {
 
             final IBinder cbBinder = callback.asBinder();
             final VcnStatusCallbackInfo cbInfo =
-                    new VcnStatusCallbackInfo(
-                            subGroup, callback, opPkgName, mDeps.getBinderCallingUid());
+                    new VcnStatusCallbackInfo(subGroup, callback, opPkgName, callingUid);
 
             try {
                 cbBinder.linkToDeath(cbInfo, 0 /* flags */);