Merge "Add test for service callback" am: cacf08f6f7 am: 655a20eff1

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

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