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: d3dd9562 -s ours am: 0bbe5dd4 -s ours am: f6b2054b -s ours
am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67a is in history

Change-Id: I9ed5c0064e7ce95647f225b3c8bb2f07639b81f7