Merge "hwc2: Check and return valid error from ControlIdlePowerCollapse"