Merge "Add mainlineModuleVersion in WifiMetrics" into rvc-dev am: f7376c2d68

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

Change-Id: I9666871fca4c08ed89016676a89f9471975b8b61
tree: 991d4cd75af7c23b4e6a210d61305298fbc271b7
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg