[automerger skipped] Merge Android R am: e4dff5b0fe -s ours am: f42c0279d0 -s ours am: 9046c1cf8b -s ours

am skip reason: Change-Id I46d858adbe921eecebfa1c07b8c480e3be998d3d with SHA-1 22608f04a6 is in history

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

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