Merge "Add metadata to VtsHalWifiSupplicantV1_1Target"