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

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

Change-Id: I67c9f4f4754cd2414ebd91e6fc6c1b9759984c4c