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

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

Change-Id: I7a634de94c38f1d5a03f8ebdcfb5e2aa906878a9