[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
Change-Id: I907470430d243218b6b4585c004930a2c3fbccf8