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