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