Merge "[SurfaceFlinger] Enable SurfaceInterceptorTest in presubmit."