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

Change-Id: I34607a9ae18dcc713d3e7a43bee4ca23883faee2