Merge "Replacing ItemInfoMatcher with predicate" into tm-dev am: f7652415 am: 8bd54c12

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



Change-Id: Ic8d20517bcc5416eaef2caba522fe6393862136a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>