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

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

Change-Id: Ief83226aee6b9ee7cc0f1d58fb14d9bfce0934dd