[automerger skipped] Merge "Bug fix of PerNetwork.mergeConnectionStats()" into mainline-prod am: 6d1c29cc1f -s ours

am skip reason: Change-Id Icfa57647c9a639f97340b0f42aef0a0e77215c93 with SHA-1 4de29ca756 is in history

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

Change-Id: Ife6d844d48d6a2f80bd7d7e5206017e08f1a28e2
tree: 15d8be6547d7ca3b4d0b91e453cf6021054f0a07
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg