Merge "Support discovering services with a NetworkRequest" am: 7b8b3ccb8e am: 2317504e35 am: 00a4143745 am: 599b35b504

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

Change-Id: I7a634de94c38f1d5a03f8ebdcfb5e2aa906878a9
tree: 4515bc322fe047a319cad3b2b7a865d9a175a5e5
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/