Merge "Bug fixes for widget picker search (2/n)" into sc-dev am: 305a44c935

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

Change-Id: Ie90daa0a4ef6459aa366b33d92f2d56ca5062651