Merge "[SurfaceFlinger] add getDisplayedContentSamplingAttributes i/f"