Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

@@ -218,9 +218,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
     }
 
     /*package*/ void onBondingDockConnect() {
-        // Don't connect just set the timer.
+        // Attempt to connect if UUIDs are available. Otherwise,
-        // TODO(): Fix the actual problem
+        // we will connect when the ACTION_UUID intent arrives.
-        mConnectAttempted = SystemClock.elapsedRealtime();
+        connect();
     }
 
     private void connectWithoutResettingTimer() {