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

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

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