Merge "Implement service resolved callback" am: 38f5d4661b

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

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