Merge "Handle privileged permission allowlist and isModule"