Merge "Merge "Clean up the keepalive slots when network disconnect" am: 8e63c9cc01 am: 0dd9daed86" into qt-dev-plus-aosp
am: 4a3040b776

Change-Id: Icb5a1b5bb10617aa5a7b35db6cf48db3dc53b7fd