[automerger skipped] Merge "Don't set he_oper_chwidth for 2.4GHz only band" am: fedda03499 am: 054eab9e17 am: b7677dc906 am: 37ce10fa38 am: 1a5337bed0 -s ours

am skip reason: Merged-In I76a5283a4f4397f4b65420b8a9cd0455249c50f1 with SHA-1 ffa5cce1dc is already in history

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

Change-Id: I86d64dc291f30bb6bebf8b9006030ea55a7543bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>