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

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

Change-Id: Ia3186d6d30fcaab371cee4adba50108a61fff515