am be11c2cf: Merge "Revert "Fix cts test LayoutTests#testSimpleRedLayout()"" into lmp-sprout-dev

* commit 'be11c2cffc70120cccf7615486496f49049dd54a':
  Revert "Fix cts test LayoutTests#testSimpleRedLayout()"