Merge "Dont remove system role when disassociate" into udc-dev am: fd64019f

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



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