tree 5270930d2e6e5f6d8accbb3ebdb2aa9d0bc298d1
parent 1fc48edf8c3b5bf5428ca0b3616854085371f882
parent eb740fdaae8d53336347535809a6fbf72f056355
author Kholoud Mohamed <kholoudm@google.com> 1613390906 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613390906 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica1c0d36a56890ea0af92dc28abcf03555bd4f07