Merge "Regard timeout as an error in the MtpDocumentsProvider test." into nyc-dev