Merge "fix(psci): skip PSCI OSI mode tests if not supported"