[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 69f5d8752f -s ours

am skip reason: Change-Id I0c15180497ffa67182a82adafe2f1002a567932c with SHA-1 66e4cbb73c is in history

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

Change-Id: Iea1b6eaa9e21ff5f3c95475c69829ddf04865f81
tree: 683a79488c53c5c50aee7b29a83014f895bd3f9e
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg