Merge "wpa_supplicant(hidl): Mask out unsupported values"