Merge "Add APIs for discover/resolve on specific networks" am: d61719c422 am: 5baa9f74ca

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

Change-Id: Iad6b5fab7501ec18dc3946194f1a26af5fd7b627