Merge "Tweak ordering of first match search" into sc-dev am: 07414d5cd5 am: 354786d4fc

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

Change-Id: I65cf050779252c7e962b2f19485a72f8e4943af1