[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e992a3925f -s ours am: 453d96b05d -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: Ifdb74bce628c311739139dea1f0e4744030b3386
tree: 0e3d372b36f4960d9a26fa32790ab9df8219f22e
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS