Merge "Fixing itemInfoMatcher not working for folders" into sc-v2-dev am: 8d9eaf0c7d

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

Change-Id: Ic48f15846d22e018042bc8d5e4a43ffbd37d374f