Merge "Add refactor discovery manager flag" into udc-dev am: 1504b1f91e

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

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