[automerger skipped] Merge RP1A.200720.011 am: c36748d954 -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: I1df730dcf25f2c06bd6305f4bc1b1fae07142984
tree: f2810f92b50d970d2f622d286acf5ff2ac921fbe
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg