Merge \"GridLayoutManager margin bug\" into nyc-support-24.1-dev
am: def53b0471

Change-Id: If102caa221d66663033c707b1723841c91cd838c