Bug: 353965234 Test: CellLayoutMethodsTest Flag: TEST_ONLY Change-Id: I831861febe78f5eda873cc924d2dde8a09e49518