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

Change-Id: I4fad7b8eff1d893ca3510c07fea4a864549b6be2