tree f1bd6634bcd68d29ad689aa6ee417066bca4ce05
parent 61dd4acc519cc11996cd78dbb7738f5cd245d5e1
parent 199dd9b36783fc00d59eceed2636b0c89433b43f
author Kholoud Mohamed <kholoudm@google.com> 1613388949 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613388949 +0000

Merge "Exposed some testAPIs in NetworkPolicyManager" am: 4338d7f97a am: 199dd9b367

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23d3633cda96492ffd8f78b1cb2f348a771d8b05