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

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

Change-Id: Icfea66a1f48d1e3fde14afa89e1c6313da01dacc