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

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



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