Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY am: fef4d0e081 am: f681de8ce3

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

Change-Id: Iee98cf89f7c498f0aefdf00ee6be0c8591972af8