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

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

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