[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5e95ddcc17 am: a2e53b87fa -s ours am: 7740e236d0 -s ours

am skip reason: Change-Id I84c06c89ceb70b56c73632de31265095a7fbcb3c with SHA-1 04fa435cb1 is in history

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

Change-Id: I206ddcd92596517da37c16f8a3cfb9ec2d3e7d71
tree: 77bcdab79f1844ad4002e8074d47fb63ce784aff
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg