Merge changes from topic "mainlineVersion" into rvc-qpr-dev am: 82a2823b96

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

Change-Id: I462e0214470b7f466c0af409db8b3a1670f1d816
tree: e86a7987a26fb902cee5728a3b271a79fa7a325d
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg