Merge "Update queryRemoteConnectionServices to fix failing CTS tests." into qt-dev