Merge change 1182

* changes:
  Settings app changes for Bluez4.

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

@@ -722,7 +722,6 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
                 break;
 
             case CONTEXT_ITEM_UNPAIR:
-                mLocalManager.getBluetoothManager().disconnectRemoteDeviceAcl(mAddress);
                 unpair();
                 break;
 

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

@@ -177,7 +177,7 @@ public class LocalBluetoothManager {
                 }
             }
 
-            if (mManager.startDiscovery(true)) {
+            if (mManager.startDiscovery()) {
                 mLastScan = System.currentTimeMillis();
             }
         }