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

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

Change-Id: I6ffad96f4e0e662be9b21607d12648f0b4d0aa81