Merge "Reduce flaky of SpaPrivilegedLibTests" into main