[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e992a3925f -s ours am: ad7187e8e1 -s ours am: 30563abf78 -s ours am: 0cf229b8c7 -s ours am: 0496b2381d -s ours am: f9c93ba60c -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: I5fd7003b28297014491f64d309151bc4c6fa1db5