Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev am: 28cfb72aaa
am: b2ad73da8e

Change-Id: I2d267d88965d3db10849ece1a920f27f75687590