Merge "Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons" into udc-dev

import android.app.role.RoleManager;

import android.companion.AssociationInfo;

import android.content.Context;

import android.os.Binder;

import android.os.UserHandle;

import android.util.Log;

import android.util.Slog;

        Slog.i(TAG, "Removing CDM role holder, role=" + deviceProfile

                + ", package=u" + userId + "\\" + packageName);

        final long identity = Binder.clearCallingIdentity();

        try {

            roleManager.removeRoleHolderAsUser(deviceProfile, packageName,

                MANAGE_HOLDERS_FLAG_DONT_KILL_APP, userHandle, context.getMainExecutor(),

                success -> {

                                + " from the list of " + deviceProfile + " holders.");

                    }

                });

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }

    private RolesUtils() {};