Merge "Revert "wifi: remove wifi instance name string check"" into android11-tests-dev