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

Change-Id: I086753aca66b6b7f21b8bc186e093975d254bc9f