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

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

Change-Id: Id36d5330fd74d7b96f9f59570f215a8dd2c929ab