Merge "Fix PackageManagerServiceHostTests disk usage" into rvc-dev