Merge "Fix device ordering" into sc-v2-dev

        @Override

        public void onDeviceListAdded(List<MediaDevice> devices) {

            synchronized (mMediaDevicesLock) {

                Collections.sort(devices, COMPARATOR);

                mMediaDevices.clear();

                mMediaDevices.addAll(devices);

                Collections.sort(devices, COMPARATOR);

                // Add disconnected bluetooth devices only when phone output device is available.

                for (MediaDevice device : devices) {

                    final int type = device.getDeviceType();