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

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

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