Merge "[automerger skipped] Merge "Add EAP methods in wifi.proto" into...

Merge "[automerger skipped] Merge "Add EAP methods in wifi.proto" into qt-qpr1-dev am: 2e112273 -s ours am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67a is in history" into rvc-dev am: cb58ccf9 -s ours am: 94247a24 -s ours am: d4c9eed8 -s ours am: a1d5cf22 -s ours
am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67a is in history

Change-Id: Iea6fbad5c2885cf3c02a977157e814772e5291f2