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" am: 6e6b1e20 am: 15691a74 -s ours
am: 6407162f
Change-Id: I6cd8ae2fb8161a7c7bcb30da8fcba96c90db997d