tree 30cf13a9c80f2ce85eee5d514c97077ea7bf9a88
parent 07526c6adc2605440b6c17b558f442ba7e192094
parent 0462549684fa59e8b7d7ad11cfcaaf95559bb24c
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: c9a39b3066 am: fb5e2409fd am: dceaec704d am: 0462549684

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

Change-Id: I7a634de94c38f1d5a03f8ebdcfb5e2aa906878a9