am 513307a1: am d87d4cf6: Merge "Fix list row layout without dimming on pre-L." into lmp-mr1-ub-dev

* commit '513307a13bb1ce45b274891b7ad1047f4efb9f2c':
  Fix list row layout without dimming on pre-L.