Merge "Failing all e2e tests after seeing a lock screen without additional checks for the lock screen" into udc-dev am: a61ac589a3

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

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