Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev...
Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fd am: d188a169
am: 06774496
* commit '06774496':
Return from onUserUnlocked if user is no longer unlocked
Change-Id: I55c190bbc0e5656d932e4dcff661f05175196953