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

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

Change-Id: Ifd30c90d5a00af7426593f929137cdf8d5b00bb4