Merge "[SurfaceFlinger] Fix SurfaceInterceptorTest"