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

Change-Id: Icdeb7d31291be9719d23526a781f628ffaab451e