Merge "Clear composition changes when a color mode is not supported" into...

Merge "Clear composition changes when a color mode is not supported" into sc-dev am: f569528b am: 897d7db3 am: a8c9977f

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15244526

Change-Id: I2a2deaa594108c2f6f01ccc499c749e46c68bb84