Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev