Merge "Remove PM#getPackageInfo call in restoreAtInstall flow" into main