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

* commit 'ff248435a56a1bb8f5f19e8b56b35900fa7415a4':
  Fix cts test LayoutTests#testSimpleRedLayout()