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: I5d6e69d78a54be962134d62262ec0938280ea8d0