Merge "Merge "Make queryRemoteConnectionServices DSDS aware." into qt-dev am: ac9d572269 am: deac4709db" into qt-r1-dev-plus-aosp
am: d8ebb085ed

Change-Id: Ica1908ab2eb62c2715293d5521cbda304837d4ba