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

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

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