Merge "Unload the duplicate unused managers when they conflict" into udc-dev am: 322a9ee2

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



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