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

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

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