am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken

core/java/android/server/BluetoothA2dpService.java

@@ -554,7 +554,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
         if (!result) {
             if (deviceObjectPath != null) {
                 String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);
-                if (address == null) return;
                 BluetoothDevice device = mAdapter.getRemoteDevice(address);
                 int state = getSinkState(device);
                 handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED);

core/jni/android_bluetooth_common.cpp

@@ -65,7 +65,6 @@ static Properties adapter_properties[] = {
     {"PairableTimeout", DBUS_TYPE_UINT32},
     {"Discovering", DBUS_TYPE_BOOLEAN},
     {"Devices", DBUS_TYPE_ARRAY},
-    {"UUIDs", DBUS_TYPE_ARRAY},
 };
 
 typedef union {