Merge "Rename SurfaceMediaSource::dump to dumpState" into oc-dev-plus-aosp