Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 35278e3a9e

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

Change-Id: I007e4ee328ffd93d00e77ce4d6894c6ee86f5b9f