Merge "Don't dismiss keyboard after clicking X button on the widgets search bar" into sc-dev am: 755723403b

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

Change-Id: Ic244ee231a6924ab111fcd123a4c6959034326f9