Merge "Add onServiceNameDiscovered/onServiceNameRemoved" am: 3b1703007e am: aba7fc39f8 am: 5355c858e4

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

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