Merge "Add SIM_PUK2 for Icc VTS tests" into pi-dev am: bef00fe1af
am: 2cb32bb603

Change-Id: I447c55074083624d3b294691d1cb459a3c6362dc