tree 001ca3325570e7430db5cfb8b37a85311491155f
parent f8cfa1867a4b1f187908cca0db4ed4caa18f5354
parent 8b038bb6bb7afd75f10fbd3186b5845bbcbdc9d3
author Xin Li <delphij@google.com> 1639450757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639450757 +0000

[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a -s ours am: f3e52a1f46 -s ours am: 54929f253a -s ours am: 8b038bb6bb -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: I7d7d5959ccfff4c28e78b956a1102ae21264e142