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

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

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