Merge "Allow compilation without HS20/INTERWORKING" am: 3c7a7cde4b

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

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