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

Change-Id: I8ef43f8516b0a8b6aac58021bcb5ee12a521aadf