Re-enable Bluetooth after a reboot, even if airplane mode is enabled.

This is to resolve Buganizer issue 6325950 and make the behaviour of
Blueooth and Wifi consistant.

Change-Id: Idd6cfa79136f7847e9e670d6d2aa0bf613b0381f
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
index 9610ffc..70c9f1f 100644
--- a/services/java/com/android/server/BluetoothManagerService.java
+++ b/services/java/com/android/server/BluetoothManagerService.java
@@ -132,7 +132,7 @@
         boolean bluetoothOn = isBluetoothPersistedStateOn();
         loadStoredNameAndAddress();
         if (DBG) Log.d(TAG, "airplaneModeOn: " + airplaneModeOn + " bluetoothOn: " + bluetoothOn);
-        if (!airplaneModeOn &&  bluetoothOn) {
+        if (bluetoothOn) {
             //Enable
             if (DBG) Log.d(TAG, "Auto-enabling Bluetooth.");
             enable();