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