Merge "[ADI][26/N] Fix GooglePackageInstaller manifest after renaming" into main