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

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

Change-Id: Id96d0aec3352490a08c9cf2f47b3b341407754d7