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

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

Change-Id: I0cb253c37fd371b4959c98b1fbd442b246e91aa3