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

Change-Id: Ie9eea5943c4108f34dc10fce8fefa8c510d04e39