[automerger skipped] Replace soong config module types with selects am: 043a796ba7 -s ours am: 3976fe261e -s ours

am skip reason: Merged-In I6f9e27224c239702764101025fe6ed1f2c93b46a with SHA-1 0b99b52358 is already in history

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

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