Merge "Workaround: don't migrate grid when hotseat size or device type changes in multi display" into sc-v2-dev am: 6173a7302b am: 0ed2edc078

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

Change-Id: I87368f40a2bb220d58378c8451f3f734f64ccf09