[automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 31180da4cc am: c26752dba8 -s ours

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

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

Change-Id: Ic53c362943a8dfd8fb107d953f2dae9a14b2b5f6
tree: 64da082f47fc5803640d257327c7466075f7f668
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/