Merge "Fix PackageManagerPerfTest with permission cache" into main