tree fb42875037e8b310ee2c1396ce1aa6fb0cc582ce
parent df1860329bfbd8ae45ab0b5314f930479aa170c7
parent 95b4551f215a2405abbb98abe1291120c5985aa1
author Frank Li <lifr@google.com> 1612520417 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612520417 +0000

Merge "[CS04]Remove hidden API usage of NetworkCapabilities" am: ec30b1105c am: 95b4551f21

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90d710054ef6b0a17c4a0511f941fc86af2d59b2