Merge "Add APIs for discovery with a network request" am: 9335a56282

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

Change-Id: I72c0f350193eb95b60fafcd4b18b3cc7b27bf161