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

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

Change-Id: Id166c7a078468554aa2efc5da2993781f470e91b