Merge "Convert PackageManagerHelper to use Dagger" into main