Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04a5 am: a3d3b58a30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7526ca7f7185ba5ee024c4fb79a23c84086ece9