Merge changes I514b5b3a,Id67082c5 into rvc-dev

* changes:
  ClientModeImpl: Ignore connect when connecting to network
  WifiDiagnostics: Add a timeout for logcat calls