Merge "Use column name instead of index in MtpDatabaseTest for readability."