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

* commit '3bb6351a4e258937be3c36d5b239f44312e998c6':

Change-Id: I62e9f3742619cca9662c8f4bdd03c02c0d028c2a