[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 3df3e56c26 -s ours

am skip reason: Change-Id I507e5505ae6b418001a1602ba77bf4acc8cbb9cb with SHA-1 889c85774e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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