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

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

Change-Id: I53e66e17f38a29b169bc0317ee910b71dd2ed24a