Merge "Implement the stop resolution with MdnsDiscoveryManager" am: 1246c7243b

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

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