Merge "SurfaceFlinger_test: disable flaking child test"