Merge "[SurfaceFlinger] add setDisplayContentSamplingEnabled i/f"