Merge "Fix queryRemoteConnectionServices for call provider + manager"