wlan: update cfg

Change-Id: I992de7d1145b7b6d09988f0b806f2a672440fa18
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2