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

    @Override

    @Override

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        mUsbManager = getContext().getSystemService(UsbManager.class);

        mUsbManager = getContext().getSystemService(UsbManager.class);

        for (int i = 0; i < 2; i++) {

            mUsbDevice = findDevice();

            mUsbDevice = findDevice();

            mManager = new MtpManager(getContext());

            mManager = new MtpManager(getContext());

            mManager.openDevice(mUsbDevice.getDeviceId());

            mManager.openDevice(mUsbDevice.getDeviceId());

            try {

                waitForStorages(mManager, mUsbDevice.getDeviceId());

                waitForStorages(mManager, mUsbDevice.getDeviceId());

                return;

            } catch (IOException exp) {

                // When the MTP device is Android, and it changes the USB device type from

                // "Charging" to "MTP", the device ID will be updated. We need to find a device

                // again.

                continue;

            }

        }

    }

    }

    @Override

    @Override