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