Merge "Revert "pm: Scan as privileged apps that share a privileged user""