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: 1933de0f
am: 78daf065
* commit '78daf065':
Use userHandle not credentialOwnerUserId to check if it needs to show lock
Change-Id: I6f373753156f3f9d1ec0fe13af35c1e6e6af2246