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

Change-Id: I2dd09b6a722a1636ac2406258e11bf92a8ede8de