Merge "WifiMigration: Add helper to perform softap.conf to XML conversion" into rvc-dev