HWC2: Use SolidColor composition for DimLayer am: 0183f7acac am: b4365b8d0b am: f12431879e  -s ours
am: 199202be65

Change-Id: I1b46c02fa5621c6ddda713206b51ae21de8237ca