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: 8ae996d0

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

Change-Id: If3d38454cef2f87fca51b03ece36a1231aff8747