Merge \"Improve GridLayoutTest\" into nyc-support-24.1-dev
am: d5e76e8fa6

Change-Id: Ie400b9f916dbdcbe5a87326d7903c8e2be2fd8be