Merge "wifi: Fix for VtsHalWifiSupplicantV1_2TargetTest failures"