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

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



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