Merge "Better error reporting for PackageManager tests"