Merge "Add onServiceNameDiscovered/onServiceNameRemoved" am: 3b1703007e am: 1311b29260

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

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