Merge "Add test for stopServiceResolution" am: 9ba6190f9b

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

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