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

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

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