Merge "[SurfaceFlinger] add getDisplayedContentSample i/f"