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

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

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