Merge "Clean up punctuation in SIM locked strings." into pi-dev
am: 8375834cc8

Change-Id: I69ed6b40698c28dd0a3d806f80e0af947949e25f