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: b36dacae
* commit 'b36dacae':
Change-Id: I2204a2d265b90a999ef7a975926722bc6c91931e