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: Icfdf05b876f08eb425ea9ec2747aeec6d082a122
tree: cd977653f0dceb123c89fe5cb9be32647a75ae0d
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg