Merge "Bug fix in wifi_hidl_test_utils" am: 2bba1b3211
am: 438d2791cc

Change-Id: I0ad003b911bd162b16a166d8025c4599b801b197