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

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

Change-Id: Iff8b98f4bb448420ae2b0cfa3c2407bf7e877f61