Merge "Fix flakiness MtpManagerTest test."