[automerger skipped] Merge QQ3A.200605.002 into master am: 9c39ee4eb3 -s ours

am skip reason: Change-Id Id8e138e9a29ac8376e246b6bbfb9c61a52a84735 with SHA-1 e1587bb421 is in history

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

Change-Id: I204279f71778811845563c819cf111f613b81b76
tree: 9024aefe819a428c37a17fa5583e58c11fb50b6b
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS