Merge "[DU04]Remove NetworkPolicyManagerInternal from NetworkStatsService" am: d15c37c0e0 am: c1e289ceaf am: f1a2f28e75

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

Change-Id: Iedf25caaa93248230abe93aeac78411d3768a7de