Merge "[DU04-1]Remove NetworkPolicyManagerInternal from NetworkStatsService" am: df246f3c62 am: ff2f7802ff

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

Change-Id: I9243bb9123a1e6db47e55bd80ecb579f934c3c16