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

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



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