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

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1435415

Change-Id: I6ebb7c6b84b45832a07dd43c198bee9ffbcfca3b