Merge "ExtractDecodeEditEncodeMuxTest: Corrected encoder output frame rate" into android12-tests-dev