Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 6e6b1e2079
am: 15691a74b5  -s ours

Change-Id: Ied52d7a7c8080177e4d45b35280ca13222c175d0