Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fdb6
am: dca21d73ce
* commit 'dca21d73ce59ac0b254e5e2a9ae976ed7d40060a':
Change-Id: Ie8b4f00289a86bb5d77bfcaa2d66ef666604bef2
This commit is contained in: