Merge "Change hotspot security to WPA3-Transition when switching from 6GHz" into main