Merge "The text on toast should be changed when remains 1 time for SIM lock...
Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d5 am: 68820626
Change-Id: If7383eeace3677f175e86939ea080db0c8da273c