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

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

Change-Id: I2f953917bb960e9f6acb499c8a0a28a0997cc694