Merge "powerhal: Remove PWR_CLPS_ENA for display_off scenario"