Merge "Add onServiceNameDiscovered/onServiceNameRemoved" am: 3b1703007e

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

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