Merge "Allow profile owners to call removeAccount"

                            userId));

        }

        /*

         * Only the system or authenticator should be allowed to remove accounts for that

         * authenticator.  This will let users remove accounts (via Settings in the system) but not

         * arbitrary applications (like competing authenticators).

         * Only the system, authenticator or profile owner should be allowed to remove accounts for

         * that authenticator.  This will let users remove accounts (via Settings in the system) but

         * not arbitrary applications (like competing authenticators).

         */

        UserHandle user = UserHandle.of(userId);

        if (!isAccountManagedByCaller(account.type, callingUid, user.getIdentifier())

                && !isSystemUid(callingUid)) {

                && !isSystemUid(callingUid)

                && !isProfileOwner(callingUid)) {

            String msg = String.format(

                    "uid %s cannot remove accounts of type: %s",

                    callingUid,