reverseUuid as workaround for QTBUG-61392 is broken for BaseUuid

I have a problem when i try to connect to a bluetooth-device with an uuid QBluetoothUuid::SerialPort on Android 7 and up. I always get "Connection to service failed". When I change qtconnectivity/src/bluetooth/qbluetoothsocket_android.cpp the function  reverseUuid to return serviceUuid instead QBluetoothUuid(). It works fine.

Problem:static QBluetoothUuid reverseUuid(const QBluetoothUuid &serviceUuid)
{

...
    if (isBaseUuid)
       return QBluetoothUuid();

...

}

No problem:

static QBluetoothUuid reverseUuid(const QBluetoothUuid &serviceUuid)
{

...
    if (isBaseUuid)
       return serviceUuid;

...

}