b911907651
Test: MediaTimestampTest, SubtitleDataTest, TimeMetadataTest Bug: 128547839, Bug: 128460405 Change-Id: I9f2b0e10b6fecbf7b0338586974ab8a720ab77b7