Merge "Merge "WifiMigration: Add helper to perform softap.conf to XML...
Merge "Merge "WifiMigration: Add helper to perform softap.conf to XML conversion" into rvc-dev am: fab0c25b am: dc937a60 am: 7e6ac5f6" into rvc-qpr-dev-plus-aosp am: d3bd5703
Change-Id: I3389482dbb6b8ea3c19f4e8c2bbdb334e2b849b7