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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8764e2fa19fbc0b93863751cc9d237c1478abaf9
tree: 97ab69b91fe73a5029426cc971bd6ec40710eb16
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg