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

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

Change-Id: I27d828a171b561efa9688484352ad3bad3ced1e6