Merge "Put SIM locked text in parenthesis" into qt-dev
am: a247762f4c

Change-Id: I2a90ad295262e088531110c39f73255eabc06f54