Merge "Revert "Implement the stop resolution with MdnsDiscoveryManager"" am: 8d45846632 am: 028a3c7052

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

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