Merge "Allow compilation without HS20/INTERWORKING" am: 3c7a7cde4b am: 695b875c54 am: 23251a9b00 am: 93e3799083 am: 1b0699ee62 am: 556093de8a

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

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