Merge "Fix taskbar restarting after turning on workapps from taskbar." into...

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

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



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