[automerger skipped] Merge RP1A.200720.011 am: c36748d954 -s ours am: d80965475d -s ours

am skip reason: Change-Id I530c9b103750b80a73e5b30eefafb0cb16b250dc with SHA-1 6268f18c0f is in history

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

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