[automerger skipped] Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev am: ec3055b9eb
am: 40f22313dc -s ours
am skip reason: change_id Iddc1dae53849760f43b41b75262358dff6ba09af with SHA1 9db4bf7dbb is in history

Change-Id: Ieb15ac82f64bb17a8a3bfcf0dfa31cb7640bfc86