Merge "wpa_supplicant(hidl): New EAP phase 2 params and NFC methods" am: a772e1703b
am: a8936164fb

Change-Id: I7c7647cea3c8dcadbb41ada7dd11123d00354390