Merge "Fix taskbar instrumentation crash" into tm-qpr-dev am: 98e4e461fe

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

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