[automerger skipped] Merge "STA is choosing open mode instead of OWE." into mainline-prod am: d963b2622c -s ours

am skip reason: Change-Id I75df731385a743a1547d8e8de1c1124e027bc7f5 with SHA-1 a2109b6379 is in history

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

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