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

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

Change-Id: I175431438e33e5b0644a21f76e4b9fc26c57fd9c