Merge "Revert "Revert "Fix privapp permission allowlisting.""" into sc-dev