Merge "Fixing TaplTests" into udc-dev am: 4d559a6c92

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

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