Merge changes from topic "s-on-r-network-ids" into sc-dev

* changes:
  Encode security type in external network IDs for S-on-R
  Only return WPA2 enterprise config if both WPA2 and WPA3 are available