Merge "Clear composition changes when a color mode is not supported" into sc-dev am: f569528b am: 981a3c1a

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

Change-Id: Id40807044d137991899d72dfc5ba6d4723a2a3af