Merge "Extract class AppsBackedUpOnThisDeviceJournal from BackupManagerService"