[automerger skipped] [Security bug fixes] Added mac address & country code len check am: ad44735f2a am: d3014090e9 -s ours

am skip reason: Merged-In I2fc79687ac820c55c27e858372aec4ae7427c551 with SHA-1 40e0dc8763 is already in history

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

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