Merge "Update queryRemoteConnectionServices to fix failing CTS tests." into qt-dev
am: 18172fd3fc

Change-Id: I7a4157f56020b5d5ce244b8793f983c04e99ca69