Merge "Support discovering services with a NetworkRequest" am: 7b8b3ccb8e am: 2317504e35

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

Change-Id: I2d77d2fd853f3e76ce83ca82a75cbd09f2edbaf6