Merge \\"HWC2: Clear transform for SolidColor layers\\" into nyc-mr1-dev am: 379d2f3528
am: 3a2de088aa

Change-Id: I6f8d91ee7c72847e9919cf1e8b550450754283cb