[automerger skipped] Merge "Merge "Fix taskbar icon flicker and jump when...

[automerger skipped] Merge "Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b7 am: 9f368706" into tm-d1-dev-plus-aosp am: c8c1dca0 -s ours

am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 e2e1509d is already in history

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



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