Merge "Fix text alignment in SIM lock dialog." into pi-dev
am: 270f608578

Change-Id: Iaec9e652cdb334ed8d1f9918c8d2ef5296c8b258