Revert "ANDROID: ABI: gki_defconfig: Make cfg80211 and mac80211 modules"

This partially reverts commit 7d8c327a.

These changes came in with the android12-5.10 merge, but the
gki_defconfig portion was reverted in commit d5b32dae
("ANDROID: GKI: put back WIFI config options from
android13-5.10"), so we need to similarly put back the wifi
config into the db845c_gki.fragment file so we can get back to
booting.

Fixes: d5b32dae ("ANDROID: GKI: put back WIFI config options from android13-5.10")
Change-Id: I8ead5e1c0d702975b609f716b291837e99c8d16e
Signed-off-by: John Stultz <john.stultz@linaro.org>