Merge "Implement service resolved callback" am: 38f5d4661b am: e0910d37c6

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

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