Merge "New API to stop service resolution" am: fd02056713 am: b5ae95a4d1

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

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