[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1

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

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