Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev am: a37556ae

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



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