Merge "Re-enabling a couple of tests" into udc-dev am: bc4813afb2 am: 7823a3f13b

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

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