tree af233de022dd72d5af4b23d97301399d8dad76bd
parent eec6fe721aadc1f39e5832c16f15e56ecfb93b72
parent 406bb037537428eb9f3d137f29e528b9d47dc9b6
author Bill Yi <byi@google.com> 1600494635 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494635 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3019727fb1 am: 406bb03753 -s ours

am skip reason: Change-Id Ib0904bbbd0d3b7888bbddafb149b93e6b657a3cd with SHA-1 eec6fe721a is in history

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

Change-Id: I9e203e94f4ca14e94ed65b1ae310c65dbde525b2