Merge "Handle Android M as a MTP device in MtpManagerTest."