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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6685f26e6f7c7d9b0da6edd147f1aa37e16d676