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

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

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