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

Change-Id: I1d0d6cbac34ee0d401f37fecb050f42ec39a0707