Merge "Revert "Verify PackageManagerShellCommand caller is shell""