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