Merge "Bug fix in wifi_hidl_test_utils"
am: 2bba1b3211

Change-Id: I6ddea41a0af9c0e40c6d39b1280ae2cc978c9162