Merge "Bug fixes for widget picker search." into sc-dev am: 378ca5e920

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

Change-Id: Ic4475ea56fe9a0cf75e26c8c7fc58f7b89b9dce8