Merge "EDI: Get device external storage path from ITestDevice (CTS)"