defconfig: Cleanup of wlan related config flags for holi

In GKI, if a config is flag enabled in a QGKI config and
disabled in debug config. Then that config flag will be
disabled for debug build and enabled for QGKI. So, this
change ensures the config flag which is enabled in lower
level config gets enabled for higher level config.

Change-Id: I6c5176e30d72a86bc6cce3b2074a8dd1d08a1e28
Signed-off-by: Sandeep Singh <sandsing@codeaurora.org>