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

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

Change-Id: Ifc9c9a6cbbcdc415899b3fee0ce8601e0107aab7

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

@@ -820,8 +820,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 */);