Merge "Remove dvrDisplayManagerClientGetSurfaceBuffers"