[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e992a3925f -s ours am: ad7187e8e1 -s ours am: 30563abf78 -s ours am: b9662d0749 -s ours

am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history

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

Change-Id: I16ccb6e77e5f48f0a842b5e869b17974d8be1b87
tree: 001ca3325570e7430db5cfb8b37a85311491155f
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS