Merge "Merge "Disconnect if the user cancels the no/partial connectivity...
Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb am: 090cd1d0" into qt-r1-dev-plus-aosp
am: 430def8e
Change-Id: I3931c3276092c582c6b58bf56b0d3082122b8456