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

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

Change-Id: I786214e1b4c53453fc761758ad2394116a8c64df