[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 skip reason: subject contains skip directive

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

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