Merge "Fix videoStateToString for audio/paused state."
am: 89e7a888be

Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0