Merge "Fix BackupRestoreTest" into sc-dev am: 199c469ed8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14122426

Change-Id: I32e7347a0aaf108c8b8ef33633ca4782a750ad89