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