[automerger skipped] Merge redfin/bramble support. am: d5a4b1969c -s ours am: 2cd60d101e -s ours

am skip reason: Change-Id Ie05fa703825c725c5f8de592eb6c6d20ebd41736 with SHA-1 8a569bd67e is in history

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

Change-Id: Ifd3048c312c3b2990766a5d3e99e0266a088f95f
tree: d974b1609195c9a8291090307cd8352f3e343db2
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg