Merge "Add Test for missing absent SIM + PIN lock case" am: 4d4554fe25 am: 5cc9c4f586
am: a774e47abf

Change-Id: I5e971e071f0f4c5acec9d92d9953db3075072422