Backport change I928544a0 to LTE branch and also handle disconnect on WifiStateMachine channel Bug: 4473750 Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
Backport change I928544a0 to LTE branch and also handle disconnect on WifiStateMachine channel Bug: 4473750 Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd