[automerger skipped] Merge "Allow privapp permission allowlist in apex" am:...

[automerger skipped] Merge "Allow privapp permission allowlist in apex" am: e978ec5b am: 1c565d5b am: 9f370ba4 am: ad82eb4e -s ours

am skip reason: Merged-In I37d6deb60f0dffb75dd634075cd95bcf7ddf9684 with SHA-1 13673883 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766011

Change-Id: I0bb678e92931baa2e2a9cc58fd63ce9dfb46e0cd