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

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

Change-Id: I48c8c30912d58120f234bd42421ea58444722cb3