[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 66fbec41cd -s ours am: 6268f18c0f -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: I2b8bb15449da0701119b1afa64410b1b7fd7fd35
tree: 77bcdab79f1844ad4002e8074d47fb63ce784aff
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg