Merge "[Search] Avoiding hiding keyboard when clearing search text" into sc-v2-dev am: 7a0cdc4801 am: fdaae1db08

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

Change-Id: I81aba8e5349bd2c38de1da8f1011ce91d6d9541a