Merge "hwc2: validate display id in SetColorModeById"