Merge "Remove gap between screenIds when restoring from single display device" into sc-v2-dev am: 048a8246fa

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

Change-Id: I4561a5a799ac82c86756f591a1b330c02974547e