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

Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7