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

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

Change-Id: I587ceb6aca2dda4b8c26047b79c09ba9a1367aa2