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

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

Change-Id: I80e913d577d05201f80555cffd3f08d9ecccddc7