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

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

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