[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: 3e0fc337a7 -s ours

am skip reason: subject contains skip directive

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

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