Merge "Fix formatting and style of PackageManagerBackupAgent" into main