Merge "Fixed Attribution Source’s calling Uid check for multiuser." am: ec48cfcfcd am: 8e151a5245

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

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

core/java/android/content/AttributionSource.java

@@ -29,6 +29,7 @@ import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Process;
+import android.os.UserHandle;
 import android.permission.PermissionManager;
 import android.util.ArraySet;
 
@@ -297,7 +298,7 @@ public final class AttributionSource implements Parcelable {
     public boolean checkCallingUid() {
         final int callingUid = Binder.getCallingUid();
         if (callingUid != Process.ROOT_UID
-                && callingUid != Process.SYSTEM_UID
+                && UserHandle.getAppId(callingUid) != Process.SYSTEM_UID
                 && callingUid != mAttributionSourceState.uid) {
             return false;
         }