Merge "wifi: Add access network type support"