Merge "wifi: add constant definition for EAP types" am: a908e65b66
am: 40dfd2d0bc

Change-Id: I155c39131c820cf7eb77ee8b9bb2b51b3eed3d08