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

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

Change-Id: Ia2b403cf4632735ad0e8e6cc8e261f21fa9e0642