tree 64b8c4f3c6811f67d410f3389d4cad7ea67ecb18
parent 5bda8be5ba168fc1d49e20228b0db2ed38ec2c7e
parent 14b1223ce859819edf4bec4335769463d7c73ea9
author Frank Li <lifr@google.com> 1612522237 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612522237 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I722bf04112fd8efd9bf01204c816a66597c186c8