Merge "Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons" into udc-dev am: c01e1ce412 am: 8d8ea6a6de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21475550 Change-Id: I3beabc63b9797288990cfac901e6dcfae96bbef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: