tree 4515bc322fe047a319cad3b2b7a865d9a175a5e5
parent 53d5d4f67ab09b2d97fd70f4db99c3b1bc954a3a
parent 599b35b50493f1a9755c94eb9c6016a48153c91d
author Remi NGUYEN VAN <reminv@google.com> 1643979343 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643979343 +0000

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