[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3019727fb1 am: 406bb03753 -s ours am: e0d5709833 -s ours am: 3a0a0d147a -s ours

am skip reason: Change-Id Ib0904bbbd0d3b7888bbddafb149b93e6b657a3cd with SHA-1 eec6fe721a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1431589

Change-Id: I371b4c7d43861984ace1437a1bb511dddc6612c6
tree: af233de022dd72d5af4b23d97301399d8dad76bd
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. src/