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

Change-Id: I14979288fef3adfc7f714d77d75a721588f00a14