Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)."...

Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6 am: 15dc59f8 am: 9fe363f1" into tm-qpr-dev-plus-aosp am: be33123c

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



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