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

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



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