Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev
am: 45e2c22d7e

Change-Id: I617a85d47514ac12b16a43e4ac139c4c849e45b1