Merge "Revert "Re-enabling a couple of tests"" into udc-dev am: 807d9c2c

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



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