Merge "WifiDiagnostics: Reduce timeout for logcat collection" into rvc-dev am: cdf16fb4a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12048624

Change-Id: I223fe917a4da5fed9800c187902aa6f560ecf71d
tree: 821755e8f6834866c6cc985196e114ca18bade14
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg