Merge "Revert "Revert "Re-enabling a couple of tests""" into udc-qpr-dev am: 8c764a08

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



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