Merge "Ancestral restore versioning for PackageManagerBackupAgent"