Merge "Make queryRemoteConnectionServices DSDS aware." into qt-dev
am: ac9d572269

Change-Id: I4dfd6da6550dd472c4ebd5c9680e107f44fe868b