tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent 532fadb17d1196199f247f598f54390352053360
parent 6bd781ebe801d1cbd80cad3f08390487630e7dd3
author Tony Wickham <twickham@google.com> 1621040827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621040827 +0000

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