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

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

Change-Id: Iecd4038860f77c88db669e4994a9c178ff6bd480