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: I31f628a23d1a4e01b06bfb6fb31aeea2dcfef231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>