tree 894e64496ce729adea31f25c722e65343bfae587
parent e868508211c242da80aecb972993f6a074ab4f5f
parent 5df03e158547963e2a92d2a91f59f9f87db3dbb0
author Tony Wickham <twickham@google.com> 1618340844 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618340844 +0000

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: I5e344b9be76c3a37e4865c0381689b85f07bd295