Merge "Clear 4-way handshake state when network is removed"
am: 86e858c699

Change-Id: I4739d744bd99cf956bc7da725e2994687fb678d8