defconfig updates to fix VPN

Change-Id: I6af73e4a878a4cf3f03aaee3b0b1a71139404666
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0