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