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

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

Change-Id: I9694ce0382950baed5e7237e936d41830e9364ce