Merge "Fix taskbar restarting after turning on workapps from taskbar." into tm-qpr-dev am: 64fd05ae am: 749763d2 am: 299a0e6f am: 46375aa6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21913192



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