Merge "Merge "Fix bugs with Remote Connection Services." into qt-dev am: 7fceb2018e am: 0c925a4bd0" into qt-r1-dev-plus-aosp