Adding feature flag for simulating two CellLayouts using one.

Bug: 188081026
Test: compiles
Change-Id: Idd9ad8c6d0e4814d93fc9dd019e250d9469020d8
1 file changed