[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 66fbec41cd -s ours am: 6268f18c0f -s ours am: ca1fb449ad -s ours

am skip reason: Change-Id I20594794bdc2aa19aaf5e63df880f8999cb25098 with SHA-1 229e3d53ab is in history

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

Change-Id: Ide8e59ce27dadf602f3f2c65c50b45a47f201304
tree: 14399c8cfa1206020951ed917cfbb9b5d26649af
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg