[automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for...

[automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e08 am: 35278e3a am: b5bbf7fe -s ours am: 8e36cb96 -s ours am: 8e5adedf -s ours

am skip reason: Merged-In I022c34b5af87fe3ff6857ea264bac2f7098eaed4 with SHA-1 ba76d15b is already in history

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

Change-Id: I76123d4d9b235df4e5886e35fc5fc5d30895fd77