Merge "Set AndroidPackage to null for archived installs." into main