Merge changes Ic0c988a9,I7efee004 into sc-dev

* changes:
  wifi: check suite-b keymgmt strictly
  wifi: handle the exception thrown from getAuthType()