Merge "Add test for stopServiceResolution" am: 9ba6190f9b am: 65fb4e77b1

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

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