Merge "Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY in RestoreDbTask" into sc-v2-dev am: f8d4041c84

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

Change-Id: I6f96097395fbefa82ad95bdb25b61812bf223941