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

Change-Id: Id0b366147c6222d82a03edcd6a8093c25a0ce596