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: If699c0ba7e4ef2e1bcb8026de6a16ed5fc599c6d