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

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

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