Merge "Unload the duplicate unused managers when they conflict" into udc-dev...

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

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



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