Merge "[Search] Fix ItemInfo assignment conflict" into sc-v2-dev am: f53278c908

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

Change-Id: I9018f824a80a7b774fa8d57c2090a0a9dee56b0a