Merge "Implement service add, remove, and probing" am: 1373b36bf7

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

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