Merge "Avoid entering an infinite loop in PackageManagerBackupAgent#onRestore" into main