Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0

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

Change-Id: Ie1e47381e84267bc10cfdc99683d328684196687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>