[automerger skipped] Merge RP1A.200720.011 am: c36748d954 -s ours am: d80965475d -s ours am: 01fd5b29f2 -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: I0e1e6708de5ca3569f6f86fe989f7c98d6c59b16
tree: bdd33b8e5546abbd80e8d221e92e9ac66acf6257
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg