Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b am:...
Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b am: 41263bf1" into nyc-mr1-dev-plus-aosp
am: f43cf5ea
* commit 'f43cf5ea':
Return null when user is locked
Change-Id: I5b54810085eeae13e048f6e68033c51d0d3f795d