Merge "Handle permissions defined by disabled system pkg in perm policy"