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

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

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