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

Change-Id: Icc1857ab61a0ac1b6c46f95c1af7a972117be846