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

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

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