Merge "Fix and re-enable Conscrypt PerfTests." into main