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: a439e9a6

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



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