Merge "Support discovering services with a NetworkRequest" am: c9a39b3066 am: fb5e2409fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952113

Change-Id: I2d77d2fd853f3e76ce83ca82a75cbd09f2edbaf6