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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I823a2663e5ea6fee8d71a3ed60a320fb1a00cd51