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

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

Change-Id: I4534763ad0cdb1d51328d1b77523c878711882a2