Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev