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

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

Change-Id: I8bed8e6d156565e1b24b0ace9585056c9a352d30