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

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



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