[automerger skipped] Merge "Allow uninstalling DMRH when not used for management" into udc-dev am: 3666ab8114 am: 151dd2315d -s ours

am skip reason: Merged-In I9fd8bed4a8203f3dbfa8dc4ea1388e7c8d136d9a with SHA-1 3d5d962a61 is already in history

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

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