Merge "Ensure InputConsumer is non-null in remaining cases" into sc-dev am: 862224f913 am: 4601153fd5

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

Change-Id: I22aa158bfac35d0e80850e89ee1ba3f79283abb2