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

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

Change-Id: Ia22e4274e1d228df74099fb90ef9f6366b5101de