Merge "Allow restore across form factors" into sc-v2-dev am: 5599b02141

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

Change-Id: I46024c6edf3539fa495ed491c679d1cdce8b5dd0