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