Merge "Add KEY_CAPTION_SERVICE_NUMBER to MediaFormat"