Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev
am: ca34ab06ec

* commit 'ca34ab06eca921f8c193dfa7d0b500b6892890e6':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: Iee4270fa80efeb14bf4e56ad481f9982fbf3ff9c