Merge "Notify caller when unlockUser() bails out"
am: e7df4aa57c

Change-Id: I095bd59c0c151fe535f66030240a2ff85b9b4bee