[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71 -s ours am: fe066eab -s ours am: 7c636e67 -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe6 is in history

Change-Id: I0937aa22f16d1356f89ca1f2b2d3d54d250da594