Merge "TranscodingSessionControllerTest: Allow extra time to receive onError"