[automerger skipped] Merge Android R am: ae0e3f4b62 -s ours am: 25b499e59f -s ours

am skip reason: Change-Id Ie10758964e24b04d7c12dbd0c61cc408ece3bad9 with SHA-1 722da03997 is in history

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

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