[automerger skipped] Merge Android R am: e4dff5b0fe -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: I9b48a4e266767f617968afa984751e87a31a0922
tree: b9dd8fcf978097d2a1c8b72daa56ddc59a713af2
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg