Merge "WifiLockManager: Fix event ordering for full Wifi locks."