[automerger skipped] Merge redfin/bramble support. am: d5a4b1969c -s ours am: 2cd60d101e -s ours am: 1a6d31a6ec -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: Ic25800f090fed219688fca7c4bcc87e97dc0f082
tree: ceb6305e055f50e4eb67f20f447b9af8686b2f8c
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg