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

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

Change-Id: Ia8a96ad61a175709e9a2f541a9fcd84be49c0711