[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a -s ours am: f3e52a1f46 -s ours am: 54929f253a -s ours am: a18d344f48 -s ours am: 367e2be3c4 -s ours am: d1a58ba269 -s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: I8afdff86530cf401ccd70f6f2a9d29fbfdcab2a5