Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev
am: 430df0fdb6

* commit '430df0fdb642847f1041756f94bf1483f7597f0c':
  Return from onUserUnlocked if user is no longer unlocked

Change-Id: I31f20d6e81d90489e17effefce0936e3e68df82d