Merge "Fix remaining renames in MtpDocumentsProvider tests."