Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c am: 030f2bd0ac
am: 96fa2e2417

Change-Id: I1093f0dd9d21592341542d77c6a7c0b87795ecef