[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c31e3686fb -s ours am: eec6fe721a -s ours am: 48759dde60 -s ours

am skip reason: Change-Id Icc2368b2b4e4359026f74b9a0bf831868bc37253 with SHA-1 869a857e7e is in history

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

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