Revert "WCNSS: Revert to previous configuration and firmware (TEMP)"

This reverts commit dee85de6a85f3adde9e7c5c6838cc768f71e5263.
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0