[automerger skipped] Merge "Merge redfin/bramble support." am: 5bf735e72d -s ours am: 1d3c9d1557 -s ours

am skip reason: Change-Id If81d2c30f480068a55c5fc12f47a1cfb54086302 with SHA-1 3ff082d40b is in history

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1466387

Change-Id: I7d64b2f84e0e3deb7c7940d93af9b787a4f211e2