Merge "Allow uninstalling DMRH when not used for management" into udc-dev am:...

Merge "Allow uninstalling DMRH when not used for management" into udc-dev am: 3666ab81 am: 942c63cf

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



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