Merge "Merge "Return from onUserUnlocked if user is no longer unlocked" into...
Merge "Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fd am: dca21d73" into nyc-mr1-dev-plus-aosp
am: 6583bf17
* commit '6583bf17':
Change-Id: I219ee31269f787f9a0bb12ff4d81bc20a5e9f857