Merge "SurfaceFlingerPerfTests: Reduce variability in results" into tm-qpr-dev