Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 9d642cbaec

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

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