Merge "Change the DiscoveryProviderManager to use the Multiplexer logic" into udc-dev am: 33d8a5305d am: ba9d7acde5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22881045

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