Merge "Remove obsolete workaround." am: ce01b71741 am: e38d10eca1 am: 0a68b0193b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic170c31983eb2781f555f6768f35854afb9945ea