Merge "Add test for stopServiceResolution" am: 9ba6190f9b am: bbcaa15d5e

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

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