ANDROID: GKI: put back WIFI config options from android13-5.10

When merging with android12-5.10 the gki_defconfig files changed,
specifically the WIFI settings.  As we don't want that for this branch,
roll those config options back to the old way.

All other config options stay the same as coming from the android12-5.10
branch.

Fixes: 2b034856 ("Merge branch 'android12-5.10' into 'android13-5.10'")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic0e3fbf55a0b54d4f82abe91651c820bff67fbdc