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

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

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