Prevent falling into OtherActivityInputConsumer when over lockscreen am: f6d75c98a9 am: 3c265823a8

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

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