Merge "Resolve READ_PRIVILEGED_PHONE_STATE bypass" into main

        // Note: Important to clear the calling identity since the code below calls into RoleManager

        // Note: Important to clear the calling identity since the code below calls into RoleManager

        // to check who holds the dialer role, and that requires MANAGE_ROLE_HOLDERS permission

        // to check who holds the dialer role, and that requires MANAGE_ROLE_HOLDERS permission

        // which is a system permission.

        // which is a system permission.

        int callingUserId = Binder.getCallingUserHandle().getIdentifier();

        long token = Binder.clearCallingIdentity();

        long token = Binder.clearCallingIdentity();

        try {

        try {

            return mDefaultDialerCache.isDefaultOrSystemDialer(

            return mDefaultDialerCache.isDefaultOrSystemDialer(

                    callingPackage, Binder.getCallingUserHandle().getIdentifier());

                    callingPackage, callingUserId);

        } finally {

        } finally {

            Binder.restoreCallingIdentity(token);

            Binder.restoreCallingIdentity(token);

        }

        }