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 am: 707b1d8e

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

Change-Id: I9f2a9c6e72a0243a030259efff372ca93d6beecc