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

Change-Id: I2ab9b4e2a2ed306edf2918f95fd44118ecf06a8e