Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev
am: ca34ab06
* commit 'ca34ab06':
Use userHandle not credentialOwnerUserId to check if it needs to show lock
Change-Id: Iee4270fa80efeb14bf4e56ad481f9982fbf3ff9c