Merge "Revert "Revert "Add device document to MtpDatabase."""