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':
Change-Id: I62e9f3742619cca9662c8f4bdd03c02c0d028c2a