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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d006c91e1d41c27ba679367c048992c88963056