Fix typo that caused spanned cells to be removed in Gridlayout (#14335)

Gridlayout removes columns and rows with no content. Gridlayout is 
supposed to check for spanned cells and not remove otherwise empty rows 
or columns if they are covered by a span.

Change-Id: I1c25a8e6426e6ce0e24f9110a6b994598c395e7a