[automerger skipped] Merge redfin/bramble support. am: d5a4b1969c -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: I23e12ee15e5fb4d44c44b59275c5a8d1ab42083b
tree: 66c10a8614bd8fecceaf23b84ae1b1f07fd38b6b
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg