[automerger skipped] Merge ab/6749736 in stage. am: fc57e8dc4e -s ours

am skip reason: Change-Id I7fd118c851e62e6ed17e59b56fbd7d83fb58857f with SHA-1 fc1ff0fd52 is in history

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

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