Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
am: b7bd2e645d

* commit 'b7bd2e645db390373d4f0847c7637d06faa1d4da':
  Call isUserUnlockingOrUnlocked with cleared identity

Change-Id: If4587d7949df3b332d50cd06f3ae3b216c767e04