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

* commit '1933de0f3e4c1df233f9cdd307929ebb7f56b052':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: I4bef71e2effb7fd11f9ea5973aeb218fcf5dabba