Merge "[WIFI] Update VTS generated file" am: 96518722ee am: 189e70056b
am: 7a93784f05

Change-Id: Iee6d5141fd406484b789be5d4387251851ca8312