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

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

Change-Id: I78b5b55221f483512d69fc4df182961bd7bcf15c