Merge "Allow privapp permission allowlist in apex" am: e978ec5b07 am: 1c565d5b4b

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

Change-Id: If9cc15759bead022245f08b02ffd3475160bee78