Add SIM pin/puk keypad shuffler [2/2]

Change-Id: Ib1c6831c721e87a0dcb2d9b10cd97275f60a6268