Merge "Implement service resolved callback" am: 38f5d4661b am: 8267018aba

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

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