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