Merge changes I514b5b3a,Id67082c5 into rvc-dev

* changes:
  ClientModeImpl: Ignore connect when connecting to network
  WifiDiagnostics: Add a timeout for logcat calls
tree: 6ddb1d8e26e5145bc31c7cfcdcada7c1aad96228
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg