Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev am: ff2171d232 am: 0e3a685ce4

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

Change-Id: I10a20ca3529b8307820d1be78edf9a5941479c32