Merge "Bug fix in wifi_hidl_test_utils"