Merge "New API to stop service resolution" am: fd02056713 am: b0a6390b7d am: 217cd6ac5e

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

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