Merge changes from topic "taskbar-hotseat" into sc-dev am: 5df03e1585

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

Change-Id: If718f50650537f80f7ea92ff0cfa12b6a33a6bd3