Merge "Storing form factor as part of backup and disabling restore if...

Merge "Storing form factor as part of backup and disabling restore if form-factor is different" into sc-v2-dev am: b78e77f5

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

Change-Id: Ib03d851a34a31d8d7a5722a6308b4d8e66d69621