[automerger skipped] Merge "Replace soong config module types with selects" into main am: 40f0830e3a -s ours am: 92c35b926a -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: Id1d5ba2f035179dd13c6caf951c1f330aebb1e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>