Merge "dpc: fix DisplayPowerControllerTest for cancelBlockScreenOn" into main